tools: libxc: arm64 support

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Tim Deegan <tim@xen.org>

diff --git a/tools/libxc/xc_core.h b/tools/libxc/xc_core.h
index 67b56a42bd82297c3ded7b54169d4ebe51f9bf37..10cbfca597915a5a3e6ce861fcf7abe82565eaf3 100644 (file)
--- a/tools/libxc/xc_core.h
+++ b/tools/libxc/xc_core.h
@@ -151,7 +151,7 @@ int xc_core_arch_map_p2m_writable(xc_interface *xch, unsigned int guest_width,
 
 #if defined (__i386__) || defined (__x86_64__)
 # include "xc_core_x86.h"
-#elif defined (__arm__)
+#elif defined (__arm__) || defined(__aarch64__)
 # include "xc_core_arm.h"
 #else
 # error "unsupported architecture"

diff --git a/tools/libxc/xenctrl.h b/tools/libxc/xenctrl.h
index 32122fd30331d7c19295948a40c69dfe3b941dab..50853af103dd30ddc24ff00773c780b0de3b68a2 100644 (file)
--- a/tools/libxc/xenctrl.h
+++ b/tools/libxc/xenctrl.h
@@ -79,6 +79,10 @@
 #define xen_mb()   asm volatile ("dmb" : : : "memory")
 #define xen_rmb()  asm volatile ("dmb" : : : "memory")
 #define xen_wmb()  asm volatile ("dmb" : : : "memory")
+#elif defined(__aarch64__)
+#define xen_mb()   asm volatile ("dmb sy" : : : "memory")
+#define xen_rmb()  asm volatile ("dmb sy" : : : "memory")
+#define xen_wmb()  asm volatile ("dmb sy" : : : "memory")
 #else
 #error "Define barriers"
 #endif